From: Alan Mackenzie <acm@muc.de>
Date: Thu, 3 Nov 2011 22:03:18 +0000 (+0000)
Subject: Merge.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~366^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b;p=emacs.git

Merge.
---

85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b